From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 10 May 2010 08:21:58 +0000 (+0100)
Subject: xl: ignore opengl unless sdl is enabled
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12210
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=dd41a2dae2691026bc739bf1673f62f228b4049b;p=xen.git

xl: ignore opengl unless sdl is enabled

The "opengl" setting is documented as having no effect unless "sdl" is
set.  Make sure this is honoured.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index da364e61d1..13fbe3684a 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -818,7 +818,7 @@ static char ** libxl_build_device_model_args(struct libxl_ctx *ctx,
             flexarray_set(dm_args, num++, "-vncunused");
         }
     }
-    if (info->sdl || info->opengl) {
+    if (info->sdl) {
         flexarray_set(dm_args, num++, "-sdl");
         if (info->opengl) {
             flexarray_set(dm_args, num++, "-disable-opengl");